Merge "Add system/core/Android.bp"