rebase L manifest on stock AOSP