Merge "Move BUILD_*_FROM_FILE to config.mk"
am: ab5ce7e1fe

Change-Id: I48441cd072e761147745ed7ca85c82f037f7c74a