Bump AOSP version to 1.7.21 am: e1be5ce0be

Change-Id: I5260acf25282794fc467b5910d3dcb3071dff502