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

Change-Id: Ia8b15bc76441e5240bc90429b56cfdf1591a93f5