Merge "Convert more of frameworks/base/packages to Android.bp"