Merge tag android-5.0.2_r1 of https://android.googlesource.com/plat…

…form/build into HEAD