Merge "Revert "Clean Paint.mBidiFlags as it is no longer used"" into jb-mr2-dev