Merge "Build HalProxy unit tests with a test library ScopedWakelock" am: 43e05713c5 am: 3e2dc4396a am: 8b9931621a

Change-Id: Ia63136e591c2e085815f9ec6af7c39295dd882fb