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

Change-Id: I7614d91eee9af0cf6393cbddf9f7dc663a40ab32