Android 5.0.0_r6

Change-Id: I12cbac05cdc51c011bcbadedaaa5447c0b5e789f