Merge "Add TestStableBufferIdAndHardwareBuffer" into oc-mr1-dev am: 2dca47f9ae
am: 31d9d095e6

Change-Id: I092f15bbf443c7074848b1e08b3afa68755ac82b