update with master branch from aosp mako