Android 7.1.2 Release 1 (N2G47D)
fix build am: 69bc432bac
am: 495d02fdd6

Change-Id: I9e9bec7e21b3846360d3370983c003f47c0e65f3