Revert "Updated prop list"

This reverts commit 2f662950718065cbc2267339cd5ace502a040f31, partially
These aren't in the nexus blob packs, but are still needed (especially
acdbloader)

Change-Id: I5e4a7a3ad0fb80db65610e3cf1f73794c7daab86
Merge branch 'cm-10.2' into martincz