Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev