Merge "gadget: android: Undo acm code movement"