Merge "Merge "Fix EncodedBuffer_test to run after making EncodedBuffer inherit...
Merge "Merge "Fix EncodedBuffer_test to run after making EncodedBuffer inherit from RefBase" into qt-dev am: e229a5b7 am: 61c4bc89" into qt-r1-dev-plus-aosp
am: d04e28ef
Change-Id: I63be90f8de9b6ccf9c39893fccdeb8f26e4a6269