Merge remote-tracking branch 'origin/t6490_fp5_qssi_CS7_r31.2' into fp5-qssi-0330

Change-Id: I554e0796aa7da347d546743b518498ff44f39ee6
tree: d0ff1a6877797e194ae91a45dc658b92b349522e
  1. .prebuilt_info/
  2. 1/
  3. 3/
  4. current/
  5. Android.bp
  6. METADATA
  7. OWNERS
  8. SoongConfig.bp