Merge "Allow sdk and core modules to use sysprop_library"
am: a46c2b1994

Change-Id: I0901e86188677a28263483cd939ac49563efa7f1