This is a merge of: http://go/wvgerrit/16616 Fixing Android Makefile to Profiler Change-Id: I2b4741fc02896927b5ed16ce68cca55d69bb5ade
This is a merge of: http://go/wvgerrit/16616 Fixing Android Makefile to Profiler Change-Id: I2b4741fc02896927b5ed16ce68cca55d69bb5ade