Merge "Fix #8185319 Need to put Android BidiFormatter into the Support Library" into jb-mr2-dev