Merge commit '3a74ee528255cc027d84b204a87b5c25e47bff79'

Merged from upstream:
    https://github.com/harfbuzz/harfbuzz.git refs/tags/2.6.4

Also update `Android.bp`.

NO_TYPO_CHECK=true

Change-Id: I606b1dc9a4994b2fb110a66309a57b00ec85da09