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

Change-Id: Ic477dca9701003c3043976d83fa587c0eac99152