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