Merge tag 'android-6.0.1_r72' into HEAD

Android 6.0.1 Release 72 (M4B30X)

Change-Id: Ida42e8942cf7ed3d69ac6cdf9fc70a0098c3b259
2 files changed