Merge "Remove GKI_USE_DYNAMIC_BUFFERS #define"
am: 07d5d52481

Change-Id: Id674b55a9e50913ca4fe929de7c5d82a6202292c