Merge "Make emoji-compat look at prebuilts in a new location."
am: 97885d9263

Change-Id: I1e6ffe228055dde54e7302a115c7ee053d8c03f2