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

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

Change-Id: Ie61dcb8cef418240fd29ea1e46a670f0a83887b5