Merge changes from topic 'adf-uapi-cleanup'

am: ae03c6917d

Change-Id: Ib23305be0f628cdb858d791474737bbfa34a13ea
This commit is contained in:
Greg Hackmann 2017-02-01 04:44:20 +00:00 committed by android-build-merger
commit 16cebae0af

Diff Content Not Available