Merge "Make MainActivity the default activity for AOSP."