Merge "Remove Android.mk rules for building bootctrl. am: 7bde6868ff am: 308431ceb7" into qt-dev-plus-aosp