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

Change-Id: I3152b6ff9ee59a0997753540891446c6053542a1