Fix typo in AndroidManifest.xml

Change-Id: I1f9012f6b4ac3553879e7c780724103aa35093b6
Merge branch 'cm' into HEAD