Merge "Add support for LOCAL_SRC_FILES_(host)_(arch)"