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

Change-Id: I4383d03bdedf10116b1e9e8c57775bba3b7918a2