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

Change-Id: I082aaa34dcea82c8fc3417b95d7f8016cb2ac088