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

Change-Id: Ic36436be35979ae93d1b1fa2c2b201e0bf2b4e06