Merge changes I1b6bd84e,I847db96b

* changes:
  fstab: Add external sdcard support
  gralloc_gbm: add .lock_ycbcr to support video playback use case