Merge tag 'android-5.0.2_r1' into HEAD

Signed-off-by: RobbieL811 <RobbieLancaster811@gmail.com>