Various theme picker fixes.
am: 535db3e0b4

Change-Id: I0985f29631db3bd663338338bea1614db22140b0
tree: bcd7fc5a25513d3a56f70d9c49e1d2518aeb3545
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml