Merge remote-tracking branch 'origin/Bitra.LA.3.2.1' into fp4t-qssi-0413

Change-Id: Ia41f05725c1abd1f337f0e57e01e32d1f2d68fbf
tree: 98d670603ce40468abeb00805f6ebffff94ee625
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS