Merge tag 'android-6.0.1_r10' into HEAD

Ticket: CYNGNOS-1404
Android 6.0.1 release 10