Android R Beta 2
Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8

Change-Id: I89177e37d0cc6ce6598248d84ef22030338ddb0c