Merge "androidboot.lrap => logical_partitions" am: 05625ab420 am: 8b328e403d
am: 7dc09a089d

Change-Id: I06ef97042a4f01c971281b83305d3cec95167934