Torch: Fix aapt warnings [translation]

Change-Id: Ibff488e8260409e0744e5f90829069efb1793918
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2