Android: Repair legacy camera and barcode