Merge "Add platform_apis in Android.bp" am: cebe8f985f am: 869f3888bd
am: 820f1feefa

Change-Id: If1d59e4bf335f1179bebf83f03644e735415a130