Move to libbase properties am: 012aa5bc82
am: 6a253467f3

Change-Id: I2d4a1e167d2f5aca4f3ecf3d105b21b647e61fd3