fix some m-c vs cedar discrepancies
Removing androidx86.json and annotating manifests