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

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