Add some changes to https://android.googlesource.com/platform/frameworks/base.git