Mms: Fix aapt warnings

Change-Id: I8acfeb53f4bb09d8f51140acac3b2f0386bfb260
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1