modifications pulled upstream from AOSPA/android_build:bacon
changes accomodate extra partitions within bacon and ensure build is aware to build those.