merging upstream AOSPA-Legacy/android_system_core:lollipop