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

Change-Id: I4cc5f5c39a444c034b2bbe8f2da100af622dba64