Merge "List partition_table.bpt as an output of running bpttool" am: aba93cf736
am: 14aa63a52a

Change-Id: If2ef06aa3c0b77506ccd7384577497d2a49456bc