[automerger skipped] Revert "Turn off aosp_cf*_auto builds"
am: 767fe8cbfa  -s ours

Change-Id: Ic153cea0ed46db2680063e2e9151ac465d889235