Merge "Move some API rules out of top-level Android.bp" into main