[automerger skipped] Merge "Build HalProxy unit tests with a test library...

[automerger skipped] Merge "Build HalProxy unit tests with a test library ScopedWakelock" into rvc-dev am: 89fe7456 am: 26f27e05 am: 5dac4c46 am: 743e197e -s ours am: c572372e -s ours
am skip reason: Change-Id Ie8d3eb606ccba3825be2c8102b9a7bc6ea033f65 with SHA-1 d5d021b3 is in history

Change-Id: Iac421a8e4f5f6cb8f2185fb3258560b23cc77814