Revert "Merge remote-tracking branch 'aosp/upstream-master'"

Revert submission 1717252

Reason for revert: Build break- b/189271590
Reverted Changes:
I316d7c8d0:ANDROID: suppress unused variable warning
I31e6f5aa1:ANDROID: Add metadata files
Id42c62c7b:Merge remote-tracking branch 'aosp/upstream-master...

Change-Id: I82121851e469e161928be0234350c60587099e71
50 files changed
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.