Merge aosp/master into cuttlefish-testing Some changes around mutex seem to be partially completed Change-Id: I1652de1f73acd22f7e49e8c3f5c7a18251bfb20f Test: Build gets further