cpufreq: interactive: base above_hispeed_delay on target freq, not current

Time to wait should be based on the intended target speed, not the
actual speed (which may be held high by another CPU).

Change-Id: Ifc5bb55d06adddb9a02af90af05398a78f282272
Reported-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Fix undefined reference to a 64bit function on ext4 stack in one of the latest 3.0.y patches.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Revert "cpufreq: interactive: cputime from latest commit is not compatible with android-3.0, so this is the backport."

This reverts commit 8418ab2411ed87781fa8145a732b6cc3e3d30cbf.
cpufreq: interactive: properly fix the cpustats since the io_is_busy patch.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
gpu: ion: Modify ION_NUM_HEAPS to reflect actual max

ION_NUM_HEAPS is meant to represent the actual max number
of heap types in the system, but currently doesn't reflect
any custom heaps.  This patch changes it to 16.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>