Revision 3.1 && track Google frameworks/base [TEMP]
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>