[automerger skipped] Convert settings mk files to bp files am: 1b28ffc172 am: 61706e3c32 -s ours
am skip reason: Change-Id I6715b0e924fc7038f744421a2a5325da7138773c with SHA-1 7024b375f5 is in history

Change-Id: I170baf931ea93f1305c37fc03b1df1588fcf8533
tree: 940fb7d996cdcc22d20648491bcdb63e9ee00763
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg