Add back AOSP Cam/Gallery