Merge "Switch to metalava"
am: 253f616726

Change-Id: I4b7a66aec534c9b87f5f08ca082fca7a398d8b20