Merge "Android.bp: workaround static lib ordering"
am: 42a7e19a59

* commit '42a7e19a59075003a98881cd61cd5aa03dfa04a0':
  Android.bp: workaround static lib ordering