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

Change-Id: Ifd171e6077f55cdd0f0e037413d195c0d5ae55f5