Add back AOSP Camera and Gallery