Apollo: Fix aapt warnings

Change-Id: Id86788a0c07c866e7c0f460fb13b4f3782f0348d
Merge branch 'cm-10.1' into martincz