Android 8.1.0 Release 40 (OPM4.171019.021.R1)
Android.mk -> Android.bp am: 1163465de6 am: b5f76c9dcb am: 06f3b59c76
am: a2f81e8e1f

Change-Id: Ia95dd79e615ed1ca66d653b1ae910d13fb1cda1e