Android n-mr2-preview-2 Release 0.2 (NPG47I,marlin)
Merge branch 'android-msm-marlin-3.18-nyc-mr1' into android-msm-marlin-3.18-nyc-mr2

April 2017.1

Bug: 35315173
Change-Id: I8fd615cf13ee4766ad12de431dce4f545540a5e5