Move to libbase properties
am: 012aa5bc82

Change-Id: I33035f4d479d3c5f39899b5802abb96931e147cb