reset main to AOSP

Change-Id: I8a8d5683ed41937d95cec4da154ab86dcee02263