am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."
am cd958154: Merge "Refactor a little bit and do the validation on also default.prop."

* commit 'cd958154a5bdb753274a338e799c3ece96ea9c5c':
  Refactor a little bit and do the validation on also default.prop.

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