Merge "Make parking_lot_core available to product and vendor am: 3db0ae7eea am: 18c32c921e am: e8fef55e87 am: 426ad3204d am: 9632beced9"