Merge "simpleperf: update build.gradle in demo apps." am: b27ffd650f
am: b0fa057725

Change-Id: Idc9f8c7fe6a8c1ba3fb0a74aa82376683a758eda