Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: 7cb6fc634a

Change-Id: I0fc20e72e7edfc5daf2068bf0aa6ea25ddb4a1c9