Update frameworks/base branch

Change-Id: Ie5246a5c3c9cdd751eeb08ab083ca1e44dffe1ea