Merge "Don't use apexd when TARGET_FLATTEN_APEX == true"