Merge "Convert sfntly to Android.bp" am: e399666315
am: b7deb2ee49

Change-Id: I48515198ee6401a1fb3f4d0e3177a6433bd5d1b2