Mako: Add OmniTorch

Change-Id: I5cc5c350a963ff2914171ad1411a6bf7479a9a9e
Merge "Mako: Add OmniTorch" into android-4.4