Merge "Android.bp: workaround static lib ordering"