Merge "Fix non-vendor.img configuration." am: 1337349ea1
am: ef7197eefa

* commit 'ef7197eefa2d000b0e446cf1fb223a55746ae2c3':
  Fix non-vendor.img configuration.