[automerger skipped] Merge "Trim away some dead code"

am: d6a1657466  -s ours

Change-Id: I7cb1845584c838fe6bcce743d9f3b9944da5d41b
This commit is contained in:
Neil Fuller
2018-06-21 16:10:26 -07:00
committed by android-build-merger

Diff Content Not Available