Merge tag 'v1.8' into xz-java

Initial import

Merge from upstream so that tools/external_updater can automatically upgrade.

Bug: http://b/122833812
Test: NA
Change-Id: I5ae7c4b6a81cd358aae484a539da1e01192fd040