am a1f8cdf7: Merge "Allow several system property files"
am a1f8cdf7: Merge "Allow several system property files"

* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
  Allow several system property files

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build