Update for android lollipop 5.x

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>