Merge "Revert "Android.bp: workaround static lib ordering""
am: e8b585e18b

* commit 'e8b585e18b4308e0d79327c5e9db546d7c37902e':
  Revert "Android.bp: workaround static lib ordering"

Change-Id: I97a037d8a7728ce09c1f34ea4dfaa087a218e73e