Android R Beta 3
Merge "Add METADATA to emma: Apache2=NOTICE" am: 5ba3fe719b

Change-Id: Ib435e7c611d839a32e39afe2270f64b21a819a65