am c0adf1e7: am f2a1ab0c: Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev

* commit 'c0adf1e7e383c2b4bce05fbd9c692f34b9ce7b2d':
  Fix CTS 4.4 R4 testHoloTheme test failure.