Merge "Merge "Remove unused HarfBuzz src in libandroid_runtime" am: b9940315 am: dbc06c23 am: e35e3b62"