Merge "Include build target for test_fips." am: a7e532950d
am: 002011a51c

Change-Id: I8be5a8cc6b9355e5ce4f9a205d22ced45f6f8cd3