Merge "Sync linker with internal branch"

am: a86e11f529

Change-Id: I658fa5cb660ca60423e171d01bed2a4f9d9139ca
This commit is contained in:
Dimitry Ivanov 2016-08-01 21:11:39 +00:00 committed by android-build-merger
commit e1b5b13b33

Diff content is not available