Merge "Add system/core/Android.bp" am: 8a1c4b8530
am: 453faf66d8

Change-Id: I574e6ee52643004beb718543f291c5f85753026d