Merge "Move BUILD_*_FROM_FILE to config.mk"