The difference between two libs are very minor,
includes one hack around ucsInfo and the logic
to adjust signal strength. Besides that other
diffs are some logs.
The new version of code is minaly based on xmm6262,
especially the logic to adjust singal strength.
Merge them to easy maintain the code.
Change-Id: I76390541d017576591860c8701bb9763c460b8be
(cherry picked from commit 56b8dcfa3094f93698dda9f6731fa845f00ef287)
Elliott Hughes