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

Change-Id: I5be80cb10c84440ea6dfde76ce040d6e54b50344