[automerger skipped] Convert settings mk files to bp files am: a016b5dc64 -s ours am: d2547542a0 -s ours am: 3c59481949 -s ours
am skip reason: Change-Id I6715b0e924fc7038f744421a2a5325da7138773c with SHA-1 1b28ffc172 is in history

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