Merge "Update for support library drop" into pi-dev-plus-aosp
tree: 276700c41e6024497f1edb881fa936f39860b5e4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml