[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 -s ours am: 89fb2951 -s ours am: bf8299b1 -s ours am: 82b8952d -s ours
am skip reason: Change-Id Ie8d3eb606ccba3825be2c8102b9a7bc6ea033f65 with SHA-1 d5d021b3 is in history

Change-Id: Ibfb37b06131efab9096cdc1047617a5e18390d70