Merge "Convert IntentPlayground/Android.mk to Android.bp"