Change-Id: Iaddf8041a3c870a986ec8999e6ccc3aede38fc4c Conflicts: rs/java/android/renderscript/BaseObj.java