Merge "Add wificond to Android makefiles" into oc-dr1-dev