Change-Id: I4914cc6c6b263a4a555b563791d040c3d399ce2d
Only the modified flags need to be redefined. Bug: 63967896 Change-Id: I521018a45a4c6b3280a4fbcf97cac698f8470a03