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