am 1ce773ac: am af173898: (-s ours) am b44e8654: am c0adf1e7: am f2a1ab0c: Merge "Fix CTS 4.4 R4 testHoloTheme test failure." into kitkat-cts-dev

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