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