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

* commit '1aa74e687ecdd2bef8fb786d8027512b6953b6ad':
  Fix non-vendor.img configuration.