Fixed manifest for android-4.3_r2.1

Change-Id: Ia884aedb2bba91b54090c86475642974542c024e
Merge remote-tracking branch 'remotes/origin/android-4.3_r2.1' into jb-4.3