Merge "Fix VtsHalRenderscriptV1_0TargetProfiling test." am: aaf4409023
am: 26eab9199f

Change-Id: I382f7861156eecd326f38569a6d29e1c3fc5672e