Fix Various build errors and system errors

Enable Circle battery by deafult

Change-Id: I3a291d0858f4c454337d2fa8a206db56b0c12c45