Merge changes from topic "am-ac447072eb954fe7949adbd0fdf838c9" into stage-aosp-master

* changes:
  Merge remote-tracking branch 'user/master' am: 8e056f46af
  Fix two build nits am: 33a4c341e4
  Remove a few more files am: 7053edb309
  Remove GPL files am: 94aa887ced
  Add metadata files am: f082a5799a