Updates for Lollipop

-- Check system props for sdk, will likely be used for server version checking
-- Change max query history size to 1

Change-Id: I2a554c8ba650db6701f408a957e179300702ffc0