Android 7.1.1 Release 0.20
Merge branch 'android-msm-marlin-3.18-ndr-factoryrom' into android-msm-marlin-3.18-nyc-mr1

Security January 2017.1

Change-Id: I324316cdb5874580139d8ccac645bb4fba49842f