"LRX21U"
"LRX21V"
Merge branch 'android-5.0.0_r7' into R7