Merge "Drop the hardware buffer" into rvc-dev am: 494960e818 am: f7400c5481

Change-Id: I00fe9cba55bd4b4ffb360ce3ac84d39d5e8579df