Merge "Remove unused HarfBuzz src in libandroid_runtime" am: b9940315bf
am: dbc06c23a6

Change-Id: I8ba1958079cd43d8cc425b185cd579de0f6e5e4a