Merge tag 'android-5.0.2_r1' into HEAD
Android 5.0.2 release 1

Signed-off-by: Dragon <dragon7780@hotmail.nl>