Merge "Refactor Android.bp build modules for readability"