default: Various manifest fixes for lolipop

Change-Id: I636d3f6b71763f0e6facbcc99d859d253c5c8f82