Merge "Add optional tags to frameworks/base ext." into gingerbread