Merge "[PATCH] CTS4.4 : Fix ThemeHostTest#testHoloThemes" into kitkat-cts-dev am: 227b641e88  -s ours am: e1eb4bb28f am: 51620a3d78 am: 0494938eea am: d1173f7cbf am: 7d5dab187d am: 170f523ebb am: 02bbad03ea am: 35c51ca321
am: 1f2b7b9311

* commit '1f2b7b9311327936ab7f442388419dbc7b689ab0':