Android 8.1.0 Release 18 (OPM5.171019.017)
Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 am: 0562b43a09 am: 22b7ea6e04 am: fbab2ed4ed am: b3d01579a0
am: 6e2ee9ad8a

* commit '6e2ee9ad8a0aeff3231f9937e46cc663aa2a64c5':