Merge "Convert RollbackTest Android.mk to an Android.bp."