Merge tag 'android-5.0.1_r1' into HEAD

45a61d4c26a17fc0bab0e4f9d767587ed76a9c95