update aosp revisions & rm extra />