Revert "rhine-common: More Android L Updates"

This reverts commit 3417dc80627a35e4eeb2bf23910239ca52bce7ba.