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

Change-Id: Iff6b06ea33607080c7d03a37a50aa04d9ef53248