Update to use STATIC_ANDROID_LIBRARIES am: e61357b2fc
am: fe41512385

Change-Id: I59b59775dc99f9c7d7eae41bb557ba4540430a80