Merge "Add Android Go defaults make file" into oc-mr1-dev