Merge "Switch to metalava"
am: f53c398133

Change-Id: Ic57af2cdbf3ca2f7158350bbdceca1b1fbc72eee