Merge tag 'android-5.0.1_r1' into HEAD

Android 5.0.1 release 1

(cherry picked from commit 9eced03d17bc0da744a3ce9e389288886520f868)

Conflicts:
	core/build_id.mk