Merge changes from topic 'proprietary-soong'

am: 503f8b0262

Change-Id: I5a822ee170e675e8ac03fa8627056ea55d9b2a18
This commit is contained in:
Dan Willemsen 2016-12-06 03:32:58 +00:00 committed by android-build-merger
commit 8c6502017d

Diff Content Not Available