Merge "Put back static Roboto font for old libraries am: ba6223c425 am: bb627a75b8" into sc-v2-dev-plus-aosp