Merge "simpleperf: move to Android.bp." am: d1b35b7603
am: c595bd5046

Change-Id: Idbcf44a13a5b4375b6cd5362e69aa039072d1b51