Android 7.1.2 Release 2 (N2G47E)
am df3b4534: (-s ours) am c2c94b1a: Merge "Revert "Delete obsolete hamcrest-hostdex rule.""

* commit 'df3b453429c1bbb9d9524c471989287d10cf2f40':