Merge "Modify Android.mk for using hide APIs"