Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4" into oc-dev-plus-aosp