Merge "Fix sdk-addon build on build servers"

am: 70d8dbc125  -s ours

Change-Id: Id065e983dfcf908f7bbfd684d0bc4f7ec3e196f2
This commit is contained in:
Jeff Gaston 2017-09-19 21:57:50 +00:00 committed by android-build-merger
commit 878d03842f

Diff content is not available